<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
    <p>这应该是jp下面的index</p>

    <a href="#">本地合并</a>
    <ul>
        <li>打破</li>
    </ul>

    <span>master冲突的示范</span>
</body>
</html>